merge emacs-24
authorKenichi Handa <handa@gnu.org>
Wed, 28 Nov 2012 11:58:44 +0000 (20:58 +0900)
committerKenichi Handa <handa@gnu.org>
Wed, 28 Nov 2012 11:58:44 +0000 (20:58 +0900)
commitb842c6175c8fd95d0227fcc5caf6a367ea702696
tree0174dffec50eb85efa12ee3a04846721f2b065d6
parent7d7fc24e1229e59048077ce698eddbd5355215f9
parent24fbf0dcd887ad31410caeced18743a4b7ca095f
merge emacs-24